Fix a crash

diff --git a/ChangeLog b/ChangeLog
index c0957a8e509a35056d3f0a6c754d1d974d3f7a8c..0605fee1b59f3ba011e6963e9a746088fa5b2b41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtksettings.c (get_color_hash): Don't crash if
+       there is no color scheme.  (#324429, Diego Gonzalez)
+
 2005-12-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystem.c (gtk_file_system_module_load): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c0957a8e509a35056d3f0a6c754d1d974d3f7a8c..0605fee1b59f3ba011e6963e9a746088fa5b2b41 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-12-17  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtksettings.c (get_color_hash): Don't crash if
+       there is no color scheme.  (#324429, Diego Gonzalez)
+
 2005-12-16  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilesystem.c (gtk_file_system_module_load): 

diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 399c8e78f7da6d7202330a37197df86ee0775cb2..1199c452e3752bcc7065711684a49beef0ecc4e1 100644 (file)
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1749,6 +1749,9 @@ get_color_hash (GtkSettings *settings)
   data = (ColorSchemeData *)g_object_get_data (G_OBJECT (settings), 
                                               "gtk-color-scheme");
 
+  if (!data)
+    return NULL;
+
   return data->color_hash;
 }